Revision: bazaar--devel--1.4--patch-60
Archive: robert.collins@canonical.com--mac
Creator: Robert Collins <robert.collins@canonical.com>
Date: Mon May 23 15:08:26 EST 2005
Standard-date: 2005-05-23 05:08:26 GMT
Modified-files: commands/add-pristine.c commands/diff.c
    commands/find-pristine.c commands/pristines.c
    commands/status.c libarch/build-revision.c
    libarch/commit.c libarch/invent.c libarch/local-cache.c
    libarch/merge-three-way.c libarch/pristines.c
    libarch/pristines.h libawk/relational.c
    libawk/relational.h
New-patches: Matthieu.Moy@imag.fr--public/bazaar--inventory-non-ascii--1.4--base-0
    Matthieu.Moy@imag.fr--public/bazaar--inventory-non-ascii--1.4--patch-1
    Matthieu.Moy@imag.fr--public/bazaar--messages--1.4--patch-2
    Matthieu.Moy@imag.fr--public/bazaar--messages--1.4--patch-3
    Matthieu.Moy@imag.fr--public/bazaar--messages--1.4--patch-4
    Matthieu.Moy@imag.fr--public/bazaar--messages--1.4--patch-5
    Matthieu.Moy@imag.fr--public/bazaar--messages--1.4--patch-6
    Matthieu.Moy@imag.fr--public/bazaar--messages--1.4--patch-7
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-87
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-88
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-89
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-90
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-91
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-92
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-93
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-94
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-95
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-96
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-97
    robert.collins@canonical.com--mac/bazaar--devel--1.4--patch-60
    thelove@canonical.com/bazaar--devo--1.4--patch-54
    thelove@canonical.com/bazaar--devo--1.4--patch-55
    thelove@canonical.com/bazaar--devo--1.4--patch-56
    thelove@canonical.com/bazaar--devo--1.4--patch-57
    thelove@canonical.com/bazaar--devo--1.4--patch-58
    thelove@canonical.com/bazaar--devo--1.4--patch-59
    thelove@canonical.com/bazaar--devo--1.4--patch-60
    thelove@canonical.com/bazaar--devo--1.4--patch-61
    thelove@canonical.com/bazaar--devo--1.4--patch-62
Summary: merge from thelove
Keywords: 

Patches applied:

 * Matthieu.Moy@imag.fr--public/bazaar--inventory-non-ascii--1.4--base-0
   tag of thelove@canonical.com/bazaar--devo--1.4--patch-58

 * Matthieu.Moy@imag.fr--public/bazaar--inventory-non-ascii--1.4--patch-1
   Allow non-ascii characters in inventory (use unsigned chars for char comparison)

 * Matthieu.Moy@imag.fr--public/bazaar--messages--1.4--patch-2
   Progress report on the same line as the message in baz diff

 * Matthieu.Moy@imag.fr--public/bazaar--messages--1.4--patch-3
   Print conflicts with " C  dir/file.c" instead of verbose message.

 * Matthieu.Moy@imag.fr--public/bazaar--messages--1.4--patch-4
   --conflicted option for status.

 * Matthieu.Moy@imag.fr--public/bazaar--messages--1.4--patch-5
   space before "done" in an output message.

 * Matthieu.Moy@imag.fr--public/bazaar--messages--1.4--patch-6
   Merge from uptream

 * Matthieu.Moy@imag.fr--public/bazaar--messages--1.4--patch-7
   progress dots on the same line as the previous message for "merge"

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-87
   talloc-manage the records in rel_tables

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-88
   merge from -mac

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-89
   merge from thelove

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-90
   merge from -mac

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-91
   merge from thelove

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-92
   code tidy up from stricter CFLAGS than used in -mac development.

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-93
   dead code removal - nothing creates locked pristines: remove all code related to locked vs unlocked pristines. Also remove the sibling tree cache search (which has created continual issues when folk change history)

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-94
   use new ar abstractions to expose the creator/copiers of rel_tables, helping diagnose memory leaks

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-95
   fix memory leak in rel_copy_table

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-96
   more rel_table memory allocation feedback foo

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-97
   fix the fix for rel_copy_table - ownership is on the result not the source

 * thelove@canonical.com/bazaar--devo--1.4--patch-54
   Output messages improvements

 * thelove@canonical.com/bazaar--devo--1.4--patch-55
   --conflicted option for status

 * thelove@canonical.com/bazaar--devo--1.4--patch-56
   much apply-changeset api and api usage cleanups to be patch-id based - snapshotting stable iteration

 * thelove@canonical.com/bazaar--devo--1.4--patch-57
   (trivial) space before "done" in an output message

 * thelove@canonical.com/bazaar--devo--1.4--patch-58
   progress dots on the same line as the previous message for "merge"

 * thelove@canonical.com/bazaar--devo--1.4--patch-59
   Allow non-ascii characters in inventory (use unsigned chars for char comparison)

 * thelove@canonical.com/bazaar--devo--1.4--patch-60
   build-revision to patch_id api throughout, as well as used apis. for added tastiness bugfix local tree retrieval to reject and replace reference trees with missing or incorrect identification... and remove larch-inherited lock-pristine ui command

 * thelove@canonical.com/bazaar--devo--1.4--patch-61
   use new ar abstractions to expose the creator/copiers of rel_tables, helping diagnose memory leaks

 * thelove@canonical.com/bazaar--devo--1.4--patch-62
   fix memory leak in rel_copy_table - highly recommended patch - fixes failure to fork errors and drops memory footprint by O(patches applied) for build_revision

